Revision: bazaar--devel--1.4--patch-9
Archive: robert.collins@canonical.com--mac
Creator: Robert Collins <robert.collins@canonical.com>
Date: Wed May 18 17:43:39 EST 2005
Standard-date: 2005-05-18 07:43:39 GMT
Modified-files: annotate/annotate.c
    commands/add-log-version.c commands/add-pristine.c
    commands/ancestry-graph.c commands/ancestry.c
    commands/annotate.c commands/apply-changeset.c
    commands/apply-delta.c commands/archive-mirror.c
    commands/branch.c commands/build-config.c
    commands/cacherev.c commands/cat-config.c
    commands/cmdutils.c commands/cmdutils.h
    commands/commit.c commands/delta.c commands/diff.c
    commands/find-pristine.c commands/get.c commands/grab.c
    commands/lock-pristine.c commands/merge.c
    commands/missing.c commands/redo.c commands/replay.c
    commands/resolved.c commands/status.c commands/switch.c
    commands/sync-tree.c commands/undo.c commands/update.c
    libarch/ancestry.c libarch/annotation-builder.c
    libarch/annotation-builder.h libarch/apply-changeset.c
    libarch/apply-changeset.h libarch/archive-cache.c
    libarch/archive-cache.h libarch/archive-mirror.c
    libarch/authinfo.c libarch/build-revision.c
    libarch/build-revision.h libarch/changeset-utils.h
    libarch/commit.c libarch/configs.c libarch/configs.h
    libarch/conflict-handling.c libarch/conflict-handling.h
    libarch/file-diffs.c libarch/import.c
    libarch/local-cache.c libarch/local-cache.h
    libarch/merge-three-way.c libarch/merge.c
    libarch/merge.h libarch/patch-parser.c
    libarch/pristines.c libarch/pristines.h
    libarch/project-tree.c libarch/project-tree.h
    libarch/replay.c libarch/sync-tree.c libarch/sync-tree.h
    libarch/tag.c libarch/tests/unit-annotate.c
    libarch/tests/unit-pfs-dav.c libarch/undo.c
    tests/test-framework
New-patches: Matthieu.Moy@imag.fr--public/bazaar--archive-mirror--1.4--patch-1
    Matthieu.Moy@imag.fr--public/bazaar--archive-mirror-req--1.4--base-0
    Matthieu.Moy@imag.fr--public/bazaar--archive-mirror-req--1.4--patch-1
    Matthieu.Moy@imag.fr--public/bazaar--authinfo--1.4--patch-3
    Matthieu.Moy@imag.fr--public/bazaar--authinfo--1.4--patch-6
    Matthieu.Moy@imag.fr--public/bazaar--authinfo-nopass--1.4--base-0
    Matthieu.Moy@imag.fr--public/bazaar--authinfo-nopass--1.4--patch-1
    Matthieu.Moy@imag.fr--public/bazaar--authinfo-nopass--1.4--patch-2
    Matthieu.Moy@imag.fr--public/bazaar--devo--1.4--patch-9
    Matthieu.Moy@imag.fr--public/bazaar--messages--1.4--base-0
    Matthieu.Moy@imag.fr--public/bazaar--messages--1.4--patch-1
    Matthieu.Moy@imag.fr--public/bazaar--requests--1.4--patch-2
    Matthieu.Moy@imag.fr--public/bazaar--requests--1.4--patch-3
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-68
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-69
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-70
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-71
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-72
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-73
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-74
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-75
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-76
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-77
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-78
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-79
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-80
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-81
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-82
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-83
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-84
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-85
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-86
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-9
    thelove@canonical.com/bazaar--devo--1.4--patch-46
    thelove@canonical.com/bazaar--devo--1.4--patch-47
    thelove@canonical.com/bazaar--devo--1.4--patch-48
    thelove@canonical.com/bazaar--devo--1.4--patch-49
    thelove@canonical.com/bazaar--devo--1.4--patch-50
    thelove@canonical.com/bazaar--devo--1.4--patch-51
    thelove@canonical.com/bazaar--devo--1.4--patch-52
    thelove@canonical.com/bazaar--devo--1.4--patch-53
Summary: merge from thelove
Keywords: 

Patches applied:

 * Matthieu.Moy@imag.fr--public/bazaar--archive-mirror--1.4--patch-1
   bugfix: baz archive-mirror -a with several archives reported archive corruption

 * Matthieu.Moy@imag.fr--public/bazaar--archive-mirror-req--1.4--base-0
   tag of thelove@canonical.com/bazaar--devo--1.4--patch-50

 * Matthieu.Moy@imag.fr--public/bazaar--archive-mirror-req--1.4--patch-1
   bugfix: baz archive-mirror -a with several archives reported archive corruption

 * Matthieu.Moy@imag.fr--public/bazaar--authinfo--1.4--patch-3
   .authinfo parser accepts lines without password field

 * Matthieu.Moy@imag.fr--public/bazaar--authinfo--1.4--patch-6
   Using NULL not allowed in rel_make_record. Use "" instead.

 * Matthieu.Moy@imag.fr--public/bazaar--authinfo-nopass--1.4--base-0
   tag of thelove@canonical.com/bazaar--devo--1.4--patch-50

 * Matthieu.Moy@imag.fr--public/bazaar--authinfo-nopass--1.4--patch-1
   .authinfo parser accepts lines without password field (tests fail)

 * Matthieu.Moy@imag.fr--public/bazaar--authinfo-nopass--1.4--patch-2
   Modified tests, fixed a bug in authinfo parsing.

 * Matthieu.Moy@imag.fr--public/bazaar--devo--1.4--patch-9
   Fixed url <-> archive name inversion in mirror error message

 * Matthieu.Moy@imag.fr--public/bazaar--messages--1.4--base-0
   tag of thelove@canonical.com/bazaar--devo--1.4--patch-48

 * Matthieu.Moy@imag.fr--public/bazaar--messages--1.4--patch-1
   Various output message trivial fixes

 * Matthieu.Moy@imag.fr--public/bazaar--requests--1.4--patch-2
   "*" at the beginning of messages in baz merge

 * Matthieu.Moy@imag.fr--public/bazaar--requests--1.4--patch-3
   Added missing "\n" in error message

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-68
   unbreak ancestry that my crack-filled eyes let break 

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-69
   minor tidyups and handle NULL when scanning ancestry

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-70
   convert annotation_builder init/finalise to new/talloc_free

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-71
   fix memory leaks in unit-annotate and assert if new leaks are introduced to the api

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-72
   talloc manage the annotated files in annotation builders

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-73
   talloc manage the annotated file array in annotation builders

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-74
   arch_annotation_builder_get_file now throws ENOENT if a file is not present

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-75
   arch_annotation_builder_get_file is now doucmented

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-76
   apply_changeset now returns the report data (talloced). As a side effect, a couple of leaks were fixed

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-77
   factor out identification of removed and missing removed files in changeset application, reducing code duplication and patch application memory footprint

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-78
   removed files management refactoring - again with the duplicate code removal

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-79
   managed the removed files array with talloc in apply_changeset_report

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-80
   more code duplication elimination in apply_changest, and cleanup the apply_changeset interface to conflicts to use the tree objects

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-81
   major sweep of char tree_root usage, cleaning it into typesafe arch_project_tree_t usage. Also cripple/partially remove the search-peer-directories cache facility which has caused so many user headaches

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-82
   in apply-changeset, nuke single letter r variable and make it part of the apply state

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-83
   factor out changeset evaluation in apply-changeset

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-84
   overhaul callback usage in apply-changeset

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-85
   more apply-changeset cleanups and rationalisaiton

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-86
   merge from thelove

 * thelove@canonical.com/bazaar--devo--1.4--patch-46
   unbreak ancestry that my crack-filled eyes let break

 * thelove@canonical.com/bazaar--devo--1.4--patch-47
   overhaul annotation_builder api to be talloc and exception friendly

 * thelove@canonical.com/bazaar--devo--1.4--patch-48
   some apply_changeset api cleanups - aggregate is now talloc managed, results are returned

 * thelove@canonical.com/bazaar--devo--1.4--patch-49
   major sweep of char tree_root usage, cleaning it into typesafe arch_project_tree_t usage. Also cripple/partially remove the search-peer-directories cache facility which has caused so many user headaches

 * thelove@canonical.com/bazaar--devo--1.4--patch-50
   Various output message trivial fixes

 * thelove@canonical.com/bazaar--devo--1.4--patch-51
   bugfix: baz archive-mirror -a with several archives reported archive corruption

 * thelove@canonical.com/bazaar--devo--1.4--patch-52
   Accept lines without password in ~/.authinfo

 * thelove@canonical.com/bazaar--devo--1.4--patch-53
   apply-changeset internal cleanups and duplicate code removal

